merge trunk
authorK. Handa <handa@gnu.org>
Mon, 2 Sep 2013 14:22:02 +0000 (23:22 +0900)
committerK. Handa <handa@gnu.org>
Mon, 2 Sep 2013 14:22:02 +0000 (23:22 +0900)
commita4ac4df2ba07fb80bf9e5775fea1527642c5b2e0
tree286461cd305bf28b10a5116c861038dc199c126f
parent6feb3b7437dab2916e1c9d93447a51e580ee82ec
parentfc0d7efc5b59aed1beb83b3d3cfbd15171d238be
merge trunk